bitkeeper revision 1.15.1.10 (3e352084u4K_4YmnX6nhqxaJQrO-hQ)

Merge labyrinth.cl.cam.ac.uk:/usr/groups/xeno/BK/xeno
into labyrinth.cl.cam.ac.uk:/usr/groups/xeno/users/akw27/xeno

diff --cc .rootkeys
Simple merge

diff --cc xen-2.4.16/common/domain.c
index ea14a5ea21a9ca894b921d1979926ad1113cb2b4,2d29dc7b1a3127f47010f2949eb3aea4ff16ba01..1128cdfa15c737fec97b3659a62ca02be6da2f2e
--- 1/xen-2.4.16/common/domain.c
--- 2/xen-2.4.16/common/domain.c
+++ b/xen-2.4.16/common/domain.c
@@@ -580,9 -572,12 +573,11 @@@ int setup_guestos(struct task_struct *p
          (alloc_address - start_address - PAGE_SIZE + virt_load_address);
      virt_stack_address  = (unsigned long)virt_startinfo_address;
  
+     unmap_domain_mem(l2start);
+ 
      /* Install the new page tables. */
      __cli();
 -    __asm__ __volatile__ (
 -        "mov %%eax,%%cr3" : : "a" (pagetable_val(p->mm.pagetable)));
 +    __write_cr3_counted(pagetable_val(p->mm.pagetable));
  
      /* Copy the guest OS image. */
      src = (char *)__va(mod[0].mod_start + 12);

diff --cc xen-2.4.16/common/memory.c
Simple merge